From 24c3906d5f3bd8ac3146847c27f0522a75bd7803 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Tue, 19 Apr 2016 22:08:31 +0200 Subject: [PATCH] Adwaita: fix insensitive switch styling misplaced backdrop disabled selector was overriding the disabled one. --- gtk/theme/Adwaita/_common.scss | 10 +++++----- gtk/theme/Adwaita/gtk-contained-dark.css | 8 ++++---- gtk/theme/Adwaita/gtk-contained.css | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 9a53650dad..25e591b203 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -2483,12 +2483,12 @@ switch { $selected_borders_color); background-color: $selected_bg_color; } - } - &:disabled { - color: $backdrop_insensitive_color; - border-color: $backdrop_borders_color; - background-color: $insensitive_bg_color; + &:disabled { + color: $backdrop_insensitive_color; + border-color: $backdrop_borders_color; + background-color: $insensitive_bg_color; + } } slider { diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 7e51232950..8560559f63 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -2694,10 +2694,10 @@ switch { switch:backdrop:checked { border-color: #0f2b48; background-color: #215d9c; } - switch:disabled { - color: #5d6767; - border-color: #262929; - background-color: #333636; } + switch:backdrop:disabled { + color: #5d6767; + border-color: #262929; + background-color: #333636; } switch slider { margin: -1px; min-width: 45px; diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 1c34692c37..7dc267f841 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -2708,10 +2708,10 @@ switch { color: #e8e8e7; border-color: #4a90d9; background-color: #4a90d9; } - switch:disabled { - color: #c3c3c0; - border-color: #c0c0bd; - background-color: #f1f1f1; } + switch:backdrop:disabled { + color: #c3c3c0; + border-color: #c0c0bd; + background-color: #f1f1f1; } switch slider { margin: -1px; min-width: 45px; -- 2.30.2